branch-updates

# DP: updates from the binutils-2.47 branch

# DP: updates from the binutils-2.47 branch

# git diff 85c8648d7f9c201195d9012494b461d2343502e1 cf9d144d5bdfcaebef7d67438f07f3e5cdf32142

Gbp-Pq: Name branch-updates.diff

diff --git a/bfd/reloc.c b/bfd/reloc.c
index 6b9e00da5d61d0244cb60833ff215fe939f1f416..f49c1972b9bfd991b8600b2271827adf2fbd39cb 100644 (file)
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -8148,8 +8148,9 @@ bfd_generic_get_relocated_section_contents (bfd *abfd,
            {
              if ((symbol->flags & BSF_SECTION_SYM)
                  && symbol->section->sec_info_type == SEC_INFO_TYPE_MERGE
-                 /* This, while apparently necessary, feels bogus.  */
-                 && !(symbol->section->flags & SEC_DEBUGGING))
+                 /* bfd_simple_get_relocated_section_contents() is special.  */
+                 && (!(input_section->flags & SEC_DEBUGGING)
+                     || link_info->input_bfds != link_info->output_bfd))
                {
                  asection *sec = symbol->section;
 

diff --git a/bfd/version.h b/bfd/version.h
index 6448f83fb5b974715a35ea1e7d7416f83265eff3..dcd87991f1bf55dc254483fd7ed7f6220ce6dbbd 100644 (file)
--- a/bfd/version.h
+++ b/bfd/version.h
@@ -16,7 +16,7 @@
 
    In releases, the date is not included in either version strings or
    sonames.  */
-#define BFD_VERSION_DATE 20260726
+#define BFD_VERSION_DATE 20260906
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
 #define REPORT_BUGS_TO @report_bugs_to@

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index ba599ef1fdaef9b58172d614615b858a7e0ae290..c02d3101cc16d9bef50dde2485d3671af8a2ed7d 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -1141,6 +1141,8 @@ my_get_expression (expressionS * ep, char ** str, int prefix_mode)
 {
   char * save_in;
 
+  memset (ep, 0, sizeof (expressionS));
+
   /* In unified syntax, all prefixes are optional.  */
   if (unified_syntax)
     prefix_mode = (prefix_mode == GE_OPT_PREFIX_BIG) ? prefix_mode
@@ -1166,8 +1168,6 @@ my_get_expression (expressionS * ep, char ** str, int prefix_mode)
       abort ();
     }
 
-  memset (ep, 0, sizeof (expressionS));
-
   save_in = input_line_pointer;
   input_line_pointer = *str;
   in_my_get_expression = true;

diff --git a/include/same-inode.h b/include/same-inode.h
index 9d9049843d185149eef4416b6dd04ebb7014a601..d9aea7b006f5bd64c75b08b4e0165740d05904f1 100644 (file)
--- a/include/same-inode.h
+++ b/include/same-inode.h
@@ -28,11 +28,12 @@
      && (a).st_dev == (b).st_dev)
 # elif defined _WIN32 && ! defined __CYGWIN__
    /* Native Windows.  */
-   /* stat() and fstat() set st_dev and st_ino to 0 if information about
+   /* stat() and fstat() set st_ino to 0 if information about
       the inode is not available.  */
 #  define SAME_INODE(a, b) \
-    (!((a).st_ino == 0 && (a).st_dev == 0) \
-     && (a).st_ino == (b).st_ino && (a).st_dev == (b).st_dev)
+    ((a).st_ino != 0                   \
+     && (a).st_ino == (b).st_ino       \
+     && (a).st_dev == (b).st_dev)
 # else
 #  define SAME_INODE(a, b)    \
     ((a).st_ino == (b).st_ino \

diff --git a/opcodes/config.in b/opcodes/config.in
index 64b3303d32d01a10a125475a0bbaf0d72dd00887..36e654292b2bf61b9fcc29e09442dfcb2089f380 100644 (file)
--- a/opcodes/config.in
+++ b/opcodes/config.in
@@ -26,14 +26,30 @@
    */
 #undef HAVE_DCGETTEXT
 
+/* Define to 1 if you have the declaration of `asprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL_ASPRINTF
+
 /* Define to 1 if you have the declaration of `basename', and to 0 if you
    don't. */
 #undef HAVE_DECL_BASENAME
 
+/* Define to 1 if you have the declaration of `snprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL_SNPRINTF
+
 /* Define to 1 if you have the declaration of `stpcpy', and to 0 if you don't.
    */
 #undef HAVE_DECL_STPCPY
 
+/* Define to 1 if you have the declaration of `strtoull', and to 0 if you
+   don't. */
+#undef HAVE_DECL_STRTOULL
+
+/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL_VSNPRINTF
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 

diff --git a/opcodes/configure b/opcodes/configure
index 8299ef7e99599d652f54f3edd910af0263420024..47afcebf50765303465c55ef06e57351d2070909 100755 (executable)
--- a/opcodes/configure
+++ b/opcodes/configure
@@ -13969,6 +13969,16 @@ CPPFLAGS=$OLD_CPPFLAGS
 
 
 
+ac_fn_c_check_decl "$LINENO" "asprintf" "ac_cv_have_decl_asprintf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_asprintf" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ASPRINTF $ac_have_decl
+_ACEOF
 ac_fn_c_check_decl "$LINENO" "basename" "ac_cv_have_decl_basename" "$ac_includes_default"
 if test "x$ac_cv_have_decl_basename" = xyes; then :
   ac_have_decl=1
@@ -13979,6 +13989,16 @@ fi
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_BASENAME $ac_have_decl
 _ACEOF
+ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_snprintf" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_SNPRINTF $ac_have_decl
+_ACEOF
 ac_fn_c_check_decl "$LINENO" "stpcpy" "ac_cv_have_decl_stpcpy" "$ac_includes_default"
 if test "x$ac_cv_have_decl_stpcpy" = xyes; then :
   ac_have_decl=1
@@ -13989,6 +14009,26 @@ fi
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_STPCPY $ac_have_decl
 _ACEOF
+ac_fn_c_check_decl "$LINENO" "strtoull" "ac_cv_have_decl_strtoull" "$ac_includes_default"
+if test "x$ac_cv_have_decl_strtoull" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRTOULL $ac_have_decl
+_ACEOF
+ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_vsnprintf" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_VSNPRINTF $ac_have_decl
+_ACEOF
 
 
 # Check if sigsetjmp is available.  Using AC_CHECK_FUNCS won't do

diff --git a/opcodes/configure.ac b/opcodes/configure.ac
index 2c2556598c96d93589c2056612a5ac31d5b117f3..c6d8972aa0a70a5ccc27c56466ae92d9316ab8c9 100644 (file)
--- a/opcodes/configure.ac
+++ b/opcodes/configure.ac
@@ -96,7 +96,7 @@ BFD_64_BIT
 AC_SUBST(HDEFINES)
 AC_PROG_INSTALL
 
-AC_CHECK_DECLS([basename, stpcpy])
+AC_CHECK_DECLS([asprintf, basename, snprintf, stpcpy, strtoull, vsnprintf])
 
 # Check if sigsetjmp is available.  Using AC_CHECK_FUNCS won't do
 # since sigsetjmp might only be defined as a macro.